]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
viewSelector: Don't focus search entry on whitespace
authorFlorian Müllner <fmuellner@gnome.org>
Fri, 22 Feb 2013 19:56:24 +0000 (20:56 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Sat, 23 Feb 2013 08:42:09 +0000 (09:42 +0100)
We recently started to trim leading and trailing whitespace from
the search string, and not to trigger a search when the resulting
string was empty. However we still allow whitespace to trigger
type-ahead-find, so that the key focus is moved briefly to the
search entry and back to the stage, resulting in a disruptive
flickering of the entry.
Fix this by excluding whitespace from triggering type-ahead-find.

https://bugzilla.gnome.org/show_bug.cgi?id=694475

js/ui/viewSelector.js

index 386150fd3190646eb354a49e81dd767361588462..011855fb503c74b7fde45b8d3ad9f354630baefd 100644 (file)
@@ -279,8 +279,7 @@ const ViewSelector = new Lang.Class({
             else
                 Main.overview.hide();
             return true;
-        } else if (Clutter.keysym_to_unicode(symbol) ||
-                   (symbol == Clutter.BackSpace && this._searchActive)) {
+        } else if (this._shouldTriggerSearch(symbol)) {
             this.startSearch(event);
         } else if (!this._searchActive) {
             if (symbol == Clutter.Tab || symbol == Clutter.Down) {
@@ -345,6 +344,17 @@ const ViewSelector = new Lang.Class({
         }
     },
 
+    _shouldTriggerSearch: function(symbol) {
+        let unicode = Clutter.keysym_to_unicode(symbol);
+        if (unicode == 0)
+            return false;
+
+        if (getTermsForSearchString(String.fromCharCode(unicode)).length > 0)
+            return true;
+
+        return symbol == Clutter.BackSpace && this._searchActive;
+    },
+
     startSearch: function(event) {
         global.stage.set_key_focus(this._text);
         this._text.event(event, true);